meson: update list of sources for changes in git master

diff --git a/gdk/meson.build b/gdk/meson.build
index 9e9b11049d072ce02b94b2beaf40091d8c03e726..a7ee89f1b5f93788400e93aba24f88c942c269b1 100644 (file)
--- a/gdk/meson.build
+++ b/gdk/meson.build
@@ -1,5 +1,4 @@
 gdk_sources = files([
-  'gdk-private.c',
   'gdk.c',
   'gdkapplaunchcontext.c',
   'gdkcairo.c',
@@ -12,6 +11,7 @@ gdk_sources = files([
   'gdkdisplay.c',
   'gdkdisplaymanager.c',
   'gdkdnd.c',
+  'gdkdrawcontext.c',
   'gdkdrawingcontext.c',
   'gdkevents.c',
   'gdkframeclock.c',
@@ -33,6 +33,7 @@ gdk_sources = files([
   'gdkseatdefault.c',
   'gdkselection.c',
   'gdkvisual.c',
+  'gdkvulkancontext.c',
   'gdkwindow.c',
   'gdkwindowimpl.c',
 ])
@@ -68,7 +69,6 @@ gdk_public_h_sources = files([
   'gdkscreen.h',
   'gdkseat.h',
   'gdkselection.h',
-  'gdktestutils.h',
   'gdkthreads.h',
   'gdktypes.h',
   'gdkvisual.h',
@@ -113,7 +113,6 @@ gdk_x_sources = files([
   'x11/gdkscreen-x11.c',
   'x11/gdkscreen-x11.h',
   'x11/gdkselection-x11.c',
-  'x11/gdktestutils-x11.c',
   'x11/gdkvisual-x11.c',
   'x11/gdkwindow-x11.c',
   'x11/gdkwindow-x11.h',
@@ -222,8 +221,6 @@ gdk_broadway_sources = files([
   'broadway/gdkscreen-broadway.c',
   'broadway/gdkscreen-broadway.h',
   'broadway/gdkselection-broadway.c',
-  'broadway/gdktestutils-broadway.c',
-  'broadway/gdkvisual-broadway.c',
   'broadway/gdkwindow-broadway.c',
   'broadway/gdkwindow-broadway.h',
 ])

diff --git a/gsk/meson.build b/gsk/meson.build
index f2a04a95da98506de35eceb0a8bd2df5f452d203..2a106437aae81357a9106a897c4cda78cffcf0b7 100644 (file)
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -1,7 +1,14 @@
-gsk_sources = files([
+gsk_public_sources = files([
   'gskrenderer.c',
   'gskrendernode.c',
-  'gskrendernodeiter.c',
+  'gskrendernodeimpl.c',
+  'gskroundedrect.c',
+  'gsktexture.c',
+])
+
+# FIXME: + $(gsk_private_vulkan_source_c)
+gsk_private_sources = files([
+  'gskcairoblur.c',
   'gskcairorenderer.c',
   'gskdebug.c',
   'gskgldriver.c',
@@ -12,11 +19,13 @@ gsk_sources = files([
   'gskshaderbuilder.c',
 ])
 
+# FIXME: do we need this variable?
+gsk_sources = gsk_public_sources + gsk_private_sources
+
 gsk_headers = files([
   'gskenums.h',
   'gskrenderer.h',
   'gskrendernode.h',
-  'gskrendernodeiter.h',
   'gsktypes.h',
   'gskcairorendererprivate.h',
   'gskdebugprivate.h',

diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build
index f21c38eb52e2405d3bf0d02ae451b70b99803076..2e0810565ab459e2a4f65c5dbabea8c1fee6125d 100644 (file)
--- a/gtk/deprecated/meson.build
+++ b/gtk/deprecated/meson.build
@@ -1,9 +1,3 @@
-gtk_deprecated_sources = files(
-  'gtkgradient.c',
-  'gtksymboliccolor.c',
-)
+gtk_deprecated_sources = files([])
 
-gtk_deprecated_headers = files([
-  'gtkgradient.h',
-  'gtksymboliccolor.h',
-])
+gtk_deprecated_headers = files([])

diff --git a/gtk/inspector/meson.build b/gtk/inspector/meson.build
index 7ca24ae2ee04513d72ed2ac599809c570b951ac4..cb7b067c641db54ecbfd6453cfb2348cb3836600 100644 (file)
--- a/gtk/inspector/meson.build
+++ b/gtk/inspector/meson.build
@@ -10,6 +10,7 @@ inspector_sources = files(
   'graphdata.c',
   'gtkstackcombo.c',
   'gtktreemodelcssnode.c',
+  'gtktreemodelrendernode.c',
   'init.c',
   'inspect-button.c',
   'magnifier.c',
@@ -19,10 +20,15 @@ inspector_sources = files(
   'object-tree.c',
   'prop-editor.c',
   'prop-list.c',
+  'recorder.c',
+  'recording.c',
+  'renderrecording.c',
+  'rendernodeview.c',
   'resource-list.c',
   'selector.c',
   'signals-list.c',
   'size-groups.c',
+  'startrecording.c',
   'statistics.c',
   'strv-editor.c',
   'treewalk.c',

diff --git a/gtk/meson.build b/gtk/meson.build
index 0d3a93552f40551f750054538f4bdb03fa01a560..d410427006ba4b180a6734361634d8656f572b5e 100644 (file)
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -42,7 +42,6 @@ gtk_sources = files([
   'gtkbuilderparser.c',
   'gtkbuiltinicon.c',
   'gtkbutton.c',
-  'gtkcairoblur.c',
   'gtkcalendar.c',
   'gtkcellarea.c',
   'gtkcellareabox.c',
@@ -88,13 +87,13 @@ gtk_sources = files([
   'gtkcssdimensionvalue.c',
   'gtkcsseasevalue.c',
   'gtkcssenumvalue.c',
+  'gtkcssfiltervalue.c',
   'gtkcssgadget.c',
   'gtkcssiconthemevalue.c',
   'gtkcssimage.c',
   'gtkcssimagebuiltin.c',
   'gtkcssimagecrossfade.c',
   'gtkcssimagefallback.c',
-  'gtkcssimagegradient.c',
   'gtkcssimageicontheme.c',
   'gtkcssimagelinear.c',
   'gtkcssimageradial.c',
@@ -299,6 +298,7 @@ gtk_sources = files([
   'gtksizerequest.c',
   'gtksizerequestcache.c',
   'gtkspinbutton.c',
+  'gtksnapshot.c',
   'gtkspinner.c',
   'gtkstack.c',
   'gtkstacksidebar.c',
@@ -547,6 +547,7 @@ gtk_public_headers = files([
   'gtksizegroup.h',
   'gtksizerequest.h',
   'gtkspinbutton.h',
+  'gtksnapshot.h',
   'gtkspinner.h',
   'gtkstack.h',
   'gtkstacksidebar.h',

diff --git a/tests/meson.build b/tests/meson.build
index cfb831dfe256987d8d13884d5ca0434c9244c346..f4d4c7a1a37a2fcff370c43f2d5fffbaf306a002 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,4 +1,3 @@
-
 test_animated_resizing = executable('animated-resizing',
   'animated-resizing.c',
   'frame-stats.c',
@@ -25,7 +24,7 @@ test_scrolling_performance = executable('scrolling-performance',
 )
 test_blur_performance = executable('blur-performance',
   'blur-performance.c',
-  '../gtk/gtkcairoblur.c',
+  '../gsk/gskcairoblur.c',
   dependencies: libgtk_dep
 )
 test_video_timer = executable('video-timer',
@@ -93,20 +92,16 @@ test_recentchoosermenu = executable('testrecentchoosermenu', 'testrecentchooserm
 test_volumebutton = executable('testvolumebutton', 'testvolumebutton.c', dependencies: libgtk_dep)
 test_scrolledwindow = executable('testscrolledwindow', 'testscrolledwindow.c', dependencies: libgtk_dep)
 test_cellarea = executable('testcellarea', 'testcellarea.c', dependencies: libgtk_dep)
-test_treemenu = executable('testtreemenu', 'testtreemenu.c', dependencies: libgtk_dep)
 test_overlay = executable('testoverlay', 'testoverlay.c', dependencies: libgtk_dep)
 test_overlaystyleclass = executable('testoverlaystyleclass', 'testoverlaystyleclass.c', dependencies: libgtk_dep)
 test_appchooser = executable('testappchooser', 'testappchooser.c', dependencies: libgtk_dep)
 test_expand = executable('testexpand', 'testexpand.c', dependencies: libgtk_dep)
 test_expander = executable('testexpander', 'testexpander.c', dependencies: libgtk_dep)
 test_switch = executable('testswitch', 'testswitch.c', dependencies: libgtk_dep)
-test_styleexamples = executable('styleexamples', 'styleexamples.c', dependencies: libgtk_dep)
 test_toplevelembed = executable('testtoplevelembed', 'testtoplevelembed.c', dependencies: libgtk_dep)
 test_textview = executable('testtextview', 'testtextview.c', dependencies: libgtk_dep)
 test_animation = executable('testanimation', 'testanimation.c', dependencies: libgtk_dep)
 test_pixbuf_scale = executable('testpixbuf_scale', 'testpixbuf-scale.c', dependencies: libgtk_dep)
-test_pixbuf_color = executable('testpixbuf_color', 'testpixbuf-color.c', dependencies: libgtk_dep)
-test_pixbuf_save = executable('testpixbuf_save', 'testpixbuf-save.c', dependencies: libgtk_dep)
 test_colorchooser = executable('testcolorchooser', 'testcolorchooser.c', dependencies: libgtk_dep)
 test_colorchooser2 = executable('testcolorchooser2', 'testcolorchooser2.c', dependencies: libgtk_dep)
 test_kineticscrolling = executable('testkineticscrolling', 'testkineticscrolling.c', dependencies: libgtk_dep)
@@ -120,7 +115,6 @@ test_popover = executable('testpopover', 'testpopover.c', dependencies: libgtk_d
 test_cairo = executable('testcairo', 'testcairo.c', dependencies: libgtk_dep)
 test_overlayscroll = executable('overlayscroll', 'overlayscroll.c', dependencies: libgtk_dep)
 test_syncscroll = executable('syncscroll', 'syncscroll.c', dependencies: libgtk_dep)
-test_subsurface = executable('subsurface', 'subsurface.c', dependencies: libgtk_dep)
 test_motion_compression = executable('motion-compression', 'motion-compression.c', dependencies: libgtk_dep)
 test_simple = executable('simple', 'simple.c', dependencies: libgtk_dep)
 test_flicker = executable('flicker', 'flicker.c', dependencies: libgtk_dep)